Merge "[automerger skipped] Merge "Prevent apps from creating blocked channel groups" into sc-qpr1-dev am: 74efab0a am: 71c862fc am: 2efb5e93 -s ours"