am c5045e87: am 3dc433fc: am ba718468: Merge changes I6d66ae3c,Iacf2814b into lmp-dev

* commit 'c5045e87e67daafde1e283adaff081c43957203a':