Merge "Remove parentSubId and define API to set groupSubId"