Merge "Fix CTS failure." into nyc-dev