Merge changes I0416b952,I53785040 am: b082e3dcac am: be6bd95db1 am: 6a43605f98
am: 4d2768c95a

Change-Id: Ic45f11a3e8db9349178a3be0f3119fb37f26776a