Merge "Fix preloaded classes for the emulator."