Merge "Fix language level 9 build."