Update for 4.3

Change-Id: I64b27b692d2b1f3b0d5e7c606a799888cd5b1ae4