Merge "Guard setting of remote entry with a permission" into udc-dev