[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-app-dev am: 5293df6bb6 am: 0089ba9485

Change-Id: I9537087f5a039e122f3a91d7d9191b8771bad602