Merge "Keystore 2.0: Make key blob upgrade atomic."