Merge "Resolve CCSDK, SDNC openjdk17 compile issues"