Merge "Fix permission access to wipeData/Device" into udc-dev