Merge changes from topic "b23270724" into lmp-dev am: 5802bad0f4 am: 49acc79a1d  -s ours am: c4f7665a60 am: 34acd22bf1
am: 05832e9282

Change-Id: Ib25486f397851bcb6cd326bf3991fa85c24ae70d