Merge "Add NS_R_INTERNAL_ERROR item into NsRcode"
am: e89c9dc529

Change-Id: Ib5b77688cc25bef0f6b9ece3d5aea043954a46fa