[automerger] Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8" into lmp-mr1-app-dev am: f25e0bad76 am: b768f451f7

Change-Id: Ifc09814ad5d26de2fc9aa5a0cad04a70524a5336