stream updates

Change-Id: I2c142dd40c90896aa12e530464fcec69f1593224