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

Change-Id: I461b70da2381c50ede745e31b28b4482cfadd555