Merge "Optionally log the transport stream transmitted to the sink." into jb-mr1-dev