Merge "Rollback jobs to jdk 11"