BUG=
R=danno@chromium.org

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

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