Merge "[automerger skipped] Merge "Add a limit on channel group creation" into...

Merge "[automerger skipped] Merge "Add a limit on channel group creation" into sc-qpr1-dev am: 50afb87b am: e7be52d1 -s ours am: 7f5dda7e -s ours am: 3ff4364f -s ours am: 317336a8 -s ours am: 19139e01 -s ours"