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

Change-Id: I479ba69abe581f053aaf8e53807d5747591fb35c