BUG=none
R=mvstanton@chromium.org,yangguo@chromium.org
LOG=n

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

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