Merge "Remove vfc_vnflcm spare code"