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

* commit '35781237f98891d15af11e18458722d7f2f891b6':
  Disable class unloading when tracing is active