[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

Change-Id: I0201484dc7447147690dbf4e0c429f515e20b6ff