BUG=4122
R=vogelheim@chromium.org
LOG=n

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

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