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

Change-Id: I3c40f98952e44516ad2e4e94d3616e991af51979