4.3 bringup

Change-Id: Idbb06172fe338817e60c307632ce9007efa965aa