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

Change-Id: I00442fe091dab72bb114ac77c20845de0050cb0f