Merge "Convert all LargeTest annotations to the new one." into nyc-andromeda-dev