4.3 bring up

Change-Id: Idb43c0436ac520e85dc351f79aa964b82129438f