Merge "Fix import order to finally match checkstyle" into main