Remove dfs cac dependency on pre cac feature flag. Change-Id: If91e3fb4cc94b669e79aa8877e7102b0cb6ef8b6 CRs-Fixed: 3424238