am 012318a9: am 0edc0bdb: Merge "Disable class unloading when tracing is active"

* commit '012318a98767c2004679b47667849f4d8d7f69d7':
  Disable class unloading when tracing is active