Merge "NativeCrypto: various fixes"