Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev
am: 89bec04cf8

* commit '89bec04cf83598b1868f3f969c220c3200028e03':
  Fix security vulnerability in ICrypto DO NOT MERGE