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

Change-Id: I33e9974174176107954cf14508734fdf8c1f98f7