Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev