Fix 4.3 merge issues.

Change-Id: I59013097b7f4fad2e35f4e03a27afb4e1d67eb07