Fix 4.3 merge issues.

Change-Id: Ia8e9928be8583799076f7170d2ee0d1abc787944