Merge "Copied NO_ERROR_CODE from SmsReponse" am: 8fc1403565 am: bea8f3ae63

Change-Id: Ied94899fbb39dc97f5d2335c3d788ef318842e48