BUG=
R=hpayer@chromium.org

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