[automerger] Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8" into lmp-mr1-dev am: 1dd89e7798 am: acb5301134 am: e288ed0263 am: 239212d20f

Change-Id: Iea0a2a05efbdb381e7ede9e55aff765ffb034a4f