BUG=chromium:685633
NOTRY=true
TBR=yangguo@chromium.org, jarin@chromium.org

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