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

Change-Id: I023ff5dc0ae2efe45f81494929640c9b96821a0d