Merge changes from topic "b23270724" into lmp-dev am: 5802bad0 am: 49acc79a -s ours

mentioned in commit 0be98247

mentioned in commit c2776e75

mentioned in commit 10449d6e

mentioned in commit 05832e92

mentioned in commit 36cd95e8

mentioned in commit 0e3e2638

mentioned in commit f7051577

mentioned in commit e257e829

mentioned in commit 8e526557

mentioned in commit a6719794