Implement support for blocking streams

Change-Id: I824b9cea71c0b76fa448fa357b6719d1ddf3199d
Merge remote-tracking branch 'koush/master' into cm-10.2