Fix 4.3 merge issues.

Change-Id: If7b4943115e4105acbf6b758c54e28343b6a343c