Merge "Migrate ClassLoaderUtils user to new package"