4.3 updates

Change-Id: I6314503b9845b79136f45dfabc52fce9e1885e54