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

* commit 'ce1340c665e8840c8856898bbfb7ee3b33765359':
  Fix tracing on user builds