Merge changes I1148ab4e,I3e8c632d,I786d7281,Icbd87b35 am: da9621ce83 am: 99522d2507

Change-Id: Ieff8ed7a3a5e6c84c875ff7b16cdc58a41ee4e51