Merge "Remove RESTRICTED bucket off code." into udc-dev