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

* commit 'c14e9468d79579bda0e6f15823ffb53c30e831a1':
  Remove MMS support from MAP profile