Merge "Keystore 2.0: Fix misinterpretation of the versionNumber."