Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev am: 57ae4db225
am: 9ed2834cba

Change-Id: Idb3ce60318983a926c615cd0fdca3b700da3902c