Merge "Use the real yaml file in testcase of system.yaml"