Merge "Keystore 2.0: Fix legacy wrapper key upgrade."