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

* commit '5a3696297b2f8d463ba601772df7af5966321d2e':
  Fix tracing on user builds