Merge "Forcefully trigger the join existing group method" into udc-dev