root: Updates from caf

Change-Id: I8192c0fe26833d44f33830d94086cd4f62264558