Fix security vulnerability in CryptoHal am: b1f8c80d3a
am: e34561be05

Change-Id: I4ae6d1080be406bf53e3617c59c75206cc5066c6