Merge "Adjust the streaming testapp for new API" am: 2361f1f118 am: 82cf93deba
am: 3f8613196f

Change-Id: I2928c18611d44abb735080d5c8d428ebcabd2e62