Merge "Keystore 2.0: Temporary fix for associating keys with their KM instance."