[automerger] Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8-lmp-mr1-dev" into lmp-mr1-app-dev am: ca00bfc2d3 am: 4195c26745 am: 5a990da7d8 am: 1a50ebffbb am: 382a668444 am: a61b87d689

Change-Id: Ie03e03b5a496f4f6e05d7f99852038eb7dbaf81f