Merge "Keystore 2.0: Small performance gain"