Port r22496 (f9dde0f) and r22498 (7a16d69)

BUG=
R=dusan.milosavljevic@imgtec.com

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

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