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

Change-Id: Ic6bd1488a735f2535e4a34fd2df4dc154a777639