Merge "Removing enforcePermissionsAndGetEnforcingAdmin from  cleanCallingIdentity block"