Merge changes from topic "am-4af8b30d3e424f52ab62149a700b0b0b"

* changes:
  [automerger skipped] Merge changes from topic "118349116" am: 90f496b14c am: 14823f0ced am: e5af4b656e  -s ours
  [automerger skipped] Add APIs to remove sub from a group and get subs in the same gorup. am: be9240bcf0 am: 7e1f24c626 am: 71f85f597f  -s ours