Merged r18234 into 3.22 branch.

BUG=323845
R=hpayer@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/3.22@18238 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Merge remote-tracking branch 'upstream/3.22' into 3.22