Update for 4.3

Change-Id: I133f1ca91574134544a6d48384f814d693491d53