Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37
am: cb63a47d41

Change-Id: I16e4b79d7fd40bf5d0e500e0cb3ba9bf33113fc8