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

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