am cd0f824a: Merge "Fix tracing on user builds"

* commit 'cd0f824a7cfe91f4db24511830658228487ae919':
  Fix tracing on user builds