R=marja@chromium.org
BUG=

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