Merge "Track change in NativeCrypto"