Port https://codereview.chromium.org/2267753002/

BUG=474921
TBR=jochen@chromium.org, kjellander@chromium.org, vogelheim@chromium.org

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