Merge changes Icce2f6ed,Ic1788f65,I59e327d4 am: cb2c0230a1

Change-Id: I8a2f9af561302b841fe18a1a32c7501697be8a01