Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0 am: 0d73e03444 am: 23566e82dd
am: a0936c7b89

Change-Id: Ida377fd6b23e208728895a70fcffca489bc5086e