Merge "Fix lint errors in the streaming API"
am: fa7e99ddf1

Change-Id: I57295aa7e212eb54014bee7580320cfd5e8d7bea