R=bradnelson@chromium.org, mtrofin@chromium.org

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