TBR=simonhatch@chromium.org

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