Reland patch originally reviewed at https://codereview.chromium.org/1268553003/

This new patch marks a test [PASS, FAIL] since it passes on some platforms.

Review URL: https://codereview.chromium.org/1273883005

Cr-Commit-Position: refs/heads/master@{#30072}