R=clemensh@chromium.org,ahaas@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2963603003
Cr-Commit-Position: refs/heads/master@{#46283}