This commit also includes a major cleanup of all channels. Change-Id: I10db9709e0cba6a0691a86482c60b5dbb2956f68 Refs: #2613