Merge "Fix build error in tee sink" into nyc-mr1-dev