Depends on https://chromereviews.googleplex.com/319777013/

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

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

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