R=jkummerow@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1477163002

Cr-Commit-Position: refs/heads/master@{#32329}