Merge "Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41 am: c7ac478f51 am: e2f5f4b110" into oc-mr1-dev-plus-aosp
am: 701f31e343

Change-Id: Ice1fc35e804b28a4c9ee28a177164d8c7d415aa5