R=bmeurer@chromium.org, gsathya@chromium.org, yangguo@chromium.org

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