R=bmeurer@chromium.org
BUG=

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