R=jarin@chromium.org, mstarzinger@chromium.org

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