R=rossberg@chromium.org, yangguo@chromium.org, adamk@chromium.org
LOG=N

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

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