Merge "Fix security vulnerability in CryptoHal" into oc-dev
am: 20e00b3f96

Change-Id: I55c59bfe9a1d1e2444e4c5d7b244a0a99dae2b04