BUG=chromium:648864,chromium:648610
NOTRY=true
TBR=jgruber@chromium.org

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