Merge "[automerger skipped] Add a limit on channel group creation am: 44440649c4 -s ours am: 60402fa09d -s ours am: fb0592895f -s ours"