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

Change-Id: I917a65a35bc607cdc9b820ac55a98d6bfab1b782