Merge "Treat non-existing types as controllable types for compatibility" into udc-dev