Fix 4.3 merge issues.

Change-Id: I8d5b5cc868659d1accfc2418e8cd30d7e1ba491f