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