Update for 4.3

Change-Id: I2ad8716e7080324ebe462d99959e288d393eca13