Merge "Merge "Clean up streaming API docs and organize errors" am: d2c8dcfcfe am: d98024a1f9 am: f83fb827a7 am: 7b8d8578de"