Ports https://codereview.chromium.org/2375753002/

TBR=dpranke@chromium.org, jochen@chromium.org

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