Fix lint errors in the streaming API
am: 4f306dedc5  -s ours

Change-Id: I270d2cae370960711b598db8cf32ab66623ea0cc