[automerger skipped] Merge "Remove parentSubId and define API to set groupSubId" am: d413b5c713 am: e1015e70c4
am: f1a39cde78  -s ours

Change-Id: Id8c859c566171be100b6da405bbdb3c26d81c42a