Merge "Remove dependency on VFC db in csit"