Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev