Merge "Fix APIs which use admin policies in permission check" into udc-dev