Merge "Copied NO_ERROR_CODE from SmsReponse" am: 8fc1403565

Change-Id: I0f9aff6853564afbc6179228584e93282bdb8b12