Merge changes from topic "am-4af8b30d3e424f52ab62149a700b0b0b"
* changes:
[automerger skipped] Merge changes from topic "118349116" am: 90f496b1 am: 14823f0c am: e5af4b65 -s ours
[automerger skipped] Add APIs to remove sub from a group and get subs in the same gorup. am: be9240bc am: 7e1f24c6 am: 71f85f59 -s ours