Port for https://codereview.chromium.org/2737493002

TEST=cctest/test-run-machops/Regression6046b
BUG=

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