Merge "Fix security vulnerability in CryptoHal" into oc-dev