Merge "Make isAdminUser a public API" into udc-dev