Merge "Pass the correct name to ClassFileLoadHook"