Merge "Add test annotations for APCT" into nyc-dev