streams block

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