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

Change-Id: Ib9fa2e872f00027572a53bfdfd1bf4945e493fdb