Merge changes I8d0f5341,Iced0de7c,I742cd614
am: 7b46197bc2

Change-Id: If1a549aa8244e25a92da2bccdbc3d17171d78505