Merge r19847 and r19893 to 3.23 branch.

R=verwaest@chromium.org
BUG=350884
LOG=N

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

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