Finish updating for 4.3

Change-Id: I911448d698d1194eeaf36e72b587157504c383a6