am 4962356d: am b95f7161: Merge "NativeCrypto: various fixes"

* commit '4962356d872deb98363c42cdf367f9a6ec2a3829':
  NativeCrypto: various fixes