root: Updates from 4.4.3/caf

Change-Id: I64041dc1aca586a617929d38db384c368f02028b