Merge "[VFc] - fix CSIT failure for lcm component"