Update for 4.3

Change-Id: I4f03bca39e59dedf50171571f05307e324dbeb2b