BUG=
R=bmeurer@chromium.org

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