Merge "Temporarily disable lazy class-file-load-hook"
am: 685629d5c1

Change-Id: Ibe09b0091c065d6b17b927c61c58ecc469138e22