BUG=chromium:535160, chromium:561530
TBR=tandrii@chromium.org, sergiyb@chromium.org, akuegel@chromium.org
LOG=n
NOTRY=true

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

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