Merge "Add new error codes in MbmsException"