Merge "Fix CTS failures on fugu" into nyc-dev