Merge "Merge "Fix lint errors in the streaming API" am: fa7e99dd am: ac9893bb am: 0d73e034 am: 23566e82 am: a0936c7b"