am 3442921f: Merge "MMS API cleanup (1/4)" into lmp-dev

* commit '3442921f2cbf42147df917618854b85f0a1f7a75':
  MMS API cleanup (1/4)