Merge changes Ieea7af39,Ic3755d1c,Ifad24b27,I3b33f2b8
am: 7709bcf840

Change-Id: I5d0c15a2be19d11694b4ba6efd8dc137f00255cf