Merge "Remove tee sink debugging at compile time" into jb-mr2-dev