[automerger skipped] Merge "Add APIs to remove sub from a group and get subs...
[automerger skipped] Merge "Add APIs to remove sub from a group and get subs in the same gorup." am: a72371ed am: 656482b4
am: 97950468 -s ours
Change-Id: I46daa6b91d356acdacc3e6a5817818ed3c464b07