Merge "Trace: unhide app tracing APIs" into jb-mr2-dev