Merge "Revert "Temporarily disable lazy class-file-load-hook"" am: 14ef97b0a7
am: 3eae172023

Change-Id: I9091fb742d092d85dd3e26ce8600ea91c6a64970