BUG=chromium:518747 R=mstarzinger@chromium.org LOG=n Review URL: https://codereview.chromium.org/1277543006 Cr-Commit-Position: refs/heads/master@{#30099}