Merge "Fix ICryptoFactory service" into oc-dev am: 2c57b00b17 am: ef38715ba3
am: b95c8638c1

Change-Id: If2a03ecb43bf8880b87e89ff251780ac82a174c0