BUG=chromium:625155
R=jkummerow@chromium.org

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