Push to alpha.3

Change-Id: I8c2766539880133dc0d06f3b402375f96011fd08