Merge "Fix documentation for channel types" into nyc-dev
am: cf7b33426e

* commit 'cf7b33426e6db0abab94895c3c89c76869f0a8c6':
  Fix documentation for channel types

Change-Id: I51bf4118a43999a599dadcee0b8129a8a1ead92f