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

Change-Id: Idc7b2897dc4a1bda38455d6fade54153770d176f