Merge "Revert "Fix lint errors in the streaming API""