Merge "Merge "Ensure that the stream feeder doesn\'t hang in write..." into...
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
am: 2c1779d5
* commit '2c1779d5':
Change-Id: I62733efef9d591961aec2329004bd321baf14e95