[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into lmp-mr1-dev am: 4c01d8afde am: fafd25255e

Change-Id: Id2a32097ac7af664a6fdb3e6e69ccdb6df38e8b4