am 0f3974c3: Merge "Enable tracing on user builds" into jb-dev

* commit '0f3974c3d0ee2ffe5e0cb9a56658ba18d511f6ea':
  Enable tracing on user builds