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

Change-Id: Ib01cacc36ddeeb6c999601ff74e717992745d40d