Merge "Remove dependency on mms-common"