BUG=chromium:679957
NOTRY=true
TBR=jarin@chromium.org,bmeurer@chromium.org

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