Merge "cirros test code changes for VCD"

No match.