Merge "Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398 am: 34639cbbab am: e168449b32" into oc-mr1-dev-plus-aosp
am: 839a419bdb

Change-Id: I3606e777fbbb3c2a1080dc71f762241fb0c7f199