Merge "Revert "Revert "Remove incorrect isDataSpaceValid""" into udc-dev