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

Change-Id: If59a44435434282d81bf82cad86d1f7e66488252