From CodeAurora branch caf/kitkat