Fix 4.3 merge issues.

Change-Id: Ia222c0e288ed3a55f3c8ad8f3a86c9a294906581