Fix 4.3 merge issues.

Change-Id: I9346126d465e0be6cf51dcf00100b3e5bdeadc6d