Merge "MMS API: ApiDemos demo app" into lmp-dev