Squash 4.3

Change-Id: I705470963d326256e3541ca7b20252dca2a7b5b9