BUG=chromium:614291
LOG=N
R=titzer@chromium.org, bradnelson@chromium.org

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