am b95f7161: Merge "NativeCrypto: various fixes"

* commit 'b95f71612d7dfc1dfcb825cb1d96ccdb95e14c0f':
  NativeCrypto: various fixes