[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

Change-Id: Ia271b641476d64d83a3ec3e62679187514aa50b6