am cd1de394: Merge "Track change in NativeCrypto"

* commit 'cd1de3940d9c389b6e69a7040c67d3abb8458ad2':
  Track change in NativeCrypto