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

Change-Id: I83948728e8ca9b9dbc975a7d1d59014688836046