TBR=jochen@chromium.org

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