R=bmeurer@chromium.org
BUG=

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