Merge "[CPS] Fix build issues from Java 17"