Merge "Temporarily disable lazy class-file-load-hook"