R=franzih@chromium.org, kozyatinskiy@chromium.org, machenbach@chromium.org
BUG=

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