BUG=chromium:535160,chromium:537247
LOG=n

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

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