Merge "Keystore 2.0: Cleanup"