am 4082bf8c: am ce1340c6: am 5a369629: am cd0f824a: Merge "Fix tracing on user builds"

* commit '4082bf8c963dbd44fe2f6367fa687217cbac58d3':
  Fix tracing on user builds