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

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