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

Change-Id: Icea965393ad64df892e36738baf734582075b160