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

Change-Id: I22876cbaf33a7716ea9495ed262f98cc8e899e25