Merge changes from topic "b23270724" into lmp-dev am: 5802bad0f4 am: 49acc79a1d  -s ours am: c4f7665a60 am: 34acd22bf1 am: 05832e9282 am: 10449d6e14 am: 36cd95e899
am: 0be98247a4

Change-Id: I0d8747c1b2944f488a4a64d56a721004ab62e300