Fix 4.3 merge issues.

Change-Id: I6cf8053d6ad8ee0198bc03a6193c3946d2dd7295