BUG=none

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