Merge \\\"More general OutputStreamDataSink.\\\" am: dca955a9bd am: 58c8559979
am: 346a716b87

Change-Id: Id7f0604064d7d8b04c22b3be8cbbe87dd51a3c3a