R=rmcilroy@chromium.org, mythria@chromium.org, leszeks@chromium.org
BUG=

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