Merge "[VFC]Refactor environment variables of VFC"