Merge "Fix security vulnerability in ICrypto"