Squash 4.3 changes

Change-Id: I72875c602da009753ae9bf39e5e92d1315c4e2c0