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

Change-Id: I1d5441f4aa0127c83c4e01ccf9bbfcfee82ee340