Merge "NativeCrypto: be more tolerant during translateKey"