Merge "Test for ns_parserr() and got a heap-buffer-overflow" am: d0494b368e am: eb21b2f142
am: 132a35b52e

Change-Id: Ibae1fd7d451ea8b8be0048f952a04b8f547e34fc