R=adamk@chromium.org, mstarzinger@chromium.org, yangguo@chromium.org
BUG=

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

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