Fix 4.3 merge issues.

Change-Id: Ic2191ff3add60ede91a824c5abc058b309f5097c