Merge "Keystore 2.0: Update service name to canonical name."