Merge "Add Keystore 2.0 service."