squash update to 4.3

Change-Id: I80acc7ccdf2365bbe73e37d2c606ca8da2d86596