Merge "Keystore 2.0: Remove references to Keystore 1" into sc-dev