Merge "Add lock/unlock CUJs to java files" into main