Merge "Supress a test on kitkat." into nyc-support-25.1-dev