PR classpath/25389: