R=ahaas@chromium.org,jochen@chromium.org

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