Merge "Fix type inference errors with kotlinc 1.9.0" into udc-mainline-prod