BUG=chromium:673246
NOTRY=true
TBR=mstarzinger,jarin

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