Merge "Enable tracing on user builds" into jb-dev