Fixes and reverts
Revert CFQ improvements
Fixes for new APIs

Change-Id: I64e93c9396a45522c2454353e46e45ae28ebc100