Port aa75904e

R=yangguo@chromium.org, joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com
BUG=v8:5821
LOG=N

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