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

Change-Id: I20fcce8e7decf5b9ba481e8c7a12d7d4c62099b4