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

Change-Id: I15d0645e9ecf47dcd21d8d5005b24a67b34f92fb