Port r22947 (e72b5aed) and r22944 (d1d8f44c)

BUG=
R=paul.lind@imgtec.com

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22948 ce2b1a6d-e550-0410-aec6-3dcde31c8c00