Merge "Keystore 2.0: Remove Keystore 1.0 and remaining references"