am b463bd41: am 645689db: am 42b68d1a: am 818164b8: Revert "Plug leak in class initialization."