Merge "Merge "Ensure that the stream feeder doesn\'t hang in write..." into nyc-dev am: e2cdb20c am: 156b1ab6" into nyc-mr1-dev-plus-aosp