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

Change-Id: I00f9b15b7d4c60c3f80ea92e2703d0add3fc5c76