R=yangguo@chromium.org,machenbach@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2529333002
Cr-Commit-Position: refs/heads/master@{#41300}