Merge "Avoid compiling monster methods in boot image"