Merge "Set CTS suite version to 7.0" into nyc-dev