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