Merge "Keystore 2.0: Add missing context in generated and import key."