Merge "services/identity: Adopt privacy team recommendation."