Merge changes I1bbf480c,Icf2059cc am: 701a99834f am: 16f46cd3d5 am: 17a1295297

Change-Id: I4f0e5b0b7f95a00bf222f31597e1d3c7c5c016c1