Merge "Fix lint errors in the streaming API"
am: b0f5d57489

Change-Id: Ic12810c6a3c795419ff7440218ffa23bad7d8401