Merge "Remove old RPC to change the group owner"