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

* commit '0edc0bdb1dc8018ec0000702e6de60e99537b519':
  Disable class unloading when tracing is active