[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-app-dev am: 220213623b am: 2a30ea07f1 am: 9edd13109f

Change-Id: Ia4138a070169443d3bbf54c93246e37f11174bfa