Merge "Remove mms-common library"