BUG=chromium:535160, chromium:561530
LOG=n
NOTRY=true

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

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