Merge "Ensure that the stream feeder doesn\'t hang in write..." into nyc-dev...
Merge "Ensure that the stream feeder doesn\'t hang in write..." into nyc-dev am: e2cdb20c am: ea249fd9
am: a6205b69
* commit 'a6205b69':
Ensure that the stream feeder doesn't hang in write...
Change-Id: Ifa0f7dbf0435a1d58f139a221c8dae336a2d7031