BUG=none R=danno@chromium.org LOG=n Review URL: https://codereview.chromium.org/960903003 Cr-Commit-Position: refs/heads/master@{#27579}