Merge "Avoid infinite loop in case system_server does not have delete access." into udc-dev