R=titzer@chromium.org
BUG=680833

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