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

Change-Id: I47de3f85eb33ace38bdc6ad66b0b2876750df074