am b6d27166: am a00bd939: Merge "Enable class unloading"

* commit 'b6d271667012d6247018cba6adde66ac820b84c2':
  Enable class unloading