Fix 4.3 merge issues.

Change-Id: I612764de38e5d7e7407c636110f27e9ff4f2681f