Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 89bec04cf8 am: f797a48b4c am: 3f05f30117 am: 007064a8ca
am: e9d5ae1e10  -s ours

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