Merge "Fix test on API 23 and earlier." into nyc-support-25.2-dev