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

Change-Id: Ib62c7560970afc33b7ce2ff2726c5e754a9baef4