Merge "Revert "Chore: Upgrade projects to use JDK17" for l2switch"