BUG=chromium:535160, chromium:568949
LOG=n
TBR=tandrii@chromium.org, kjellander@chromium.org
NOTRY=true

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

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