Merge \"More general OutputStreamDataSink.\"
am: dca955a9bd

Change-Id: Id94e07f6007c3288c0501d6cd9017680108e4dbf