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

Change-Id: I51ade1ebf5e53b0e8e76a6f08eb80258558c4cdb