R=mlippautz@chromium.org

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

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