BUG=chromium:635948
R=dgozman@chromium.org,jochen@chromium.org

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