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

Change-Id: Ieaa270136b316cda710331f4afe4dd74639fdbdd