Merge "Remove parentSubId and define API to set groupSubId"
am: d413b5c713

Change-Id: I714ef99b6b6ec2cbf39264eaca6f83142b743f6e