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

Change-Id: I82cb1673fc8a066d5101bde8ae26d97ce781e253