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

Change-Id: I4191c7719ac0450a3efda91efdc2626c823fe59f