Merge changes I1f70f2c4,I698ca962,Idbbf2682
am: 960ed3ce1b

Change-Id: Ia318890180132e04180c6d461b04ee046f341358