R=leszeks@chromium.org
BUG=chromium:633159

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