Merge "Fix lint errors in the streaming API" am: fa7e99ddf1
am: ac9893bba0

Change-Id: I0ae2ee130deb1d84cc9e343e9764f65ba46d3fd1