BUG=chromium:513074
R=bmeurer@chromium.org
LOG=n

Review URL: https://codereview.chromium.org/1249273003

Cr-Commit-Position: refs/heads/master@{#29827}