Port r24927 (244472a)

BUG=
R=paul.lind@imgtec.com

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

Cr-Commit-Position: refs/heads/master@{#24950}
git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24950 ce2b1a6d-e550-0410-aec6-3dcde31c8c00