Merge "Add NS_R_INTERNAL_ERROR item into NsRcode" am: e89c9dc529 am: 19ece77c54 am: 565e15ee9c
am: 83ef1697e3

Change-Id: I6c232f050f6312bf42d9ba4e4d0054a6a1473655