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

Change-Id: I55f9d7e583950a5a67de8775b6c0f1640430aac8