Port https://chromium-review.googlesource.com/c/519267/.

R=bmeurer@chromium.org

Bug: v8:6048
Change-Id: Ic94a12b30967fd26ebfa0c6752475d0c013f81e4
Reviewed-on: https://chromium-review.googlesource.com/565400Reviewed-by: Michael Stanton <mvstanton@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46514}