Merge "Add NS_R_INTERNAL_ERROR item into NsRcode" am: e89c9dc529
am: 19ece77c54

Change-Id: Iecacfb1ff3ae6873af35c9c79998cbe8dc9b1a9a