Merge "Fix lint errors in the streaming API"