[automerger] Merge "Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde" into lmp-mr1-app-dev am: 7321b13ddc am: 1d8b613b36 am: aa60232374 am: dccc5e3efe am: b368bac0f4

Change-Id: Ib49df47342712904a0a10cd75ff6632d5045dea0