Merge "Removing enforcePermissionsAndGetEnforcingAdmin from  cleanCallingIdentity block" into udc-dev