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

Change-Id: I5a1574f05d6af8c7c2ed81ab80d42db594fce252