Fix lint errors in the streaming API am: 4f306dedc5  -s ours
am: b6fd2ba1a7

Change-Id: I21ed2bbf6753bcd2cfc8fce0363df24e1296fe33