Merge changes from topic "b23270724" into lmp-dev am: 5802bad0 am:...

Merge changes from topic "b23270724" into lmp-dev am: 5802bad0 am: 49acc79a  -s ours am: c4f7665a am: 34acd22b am: 05832e92 am: 10449d6e am: 36cd95e8 am: 0be98247 am: c2776e75 am: 0e3e2638 am: f7051577 am: e257e829 am: 8e526557
am: 033c6373

Change-Id: I9078ba871610d4878d26a7a225f4a11e2b981695