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

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