Merge "Revert "Enable LimitDevicesRule decorators to be used on class"" into udc-dev