Merge "Remove MMS support from MAP profile" into klp-dev