4.3 changes

Change-Id: I1889cb03610e0e348fed8f7abbcdd02a17abc67e