Merge "Restore the ability to build tee sink for debugging" into lmp-dev