Merge "Add more sms error codes"