Merge "Merge "Clean up streaming API docs and organize errors" am: d2c8dcfc am: d98024a1 am: f83fb827 am: 7b8d8578"