PR java/24321: