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

Change-Id: I4ed0c97ac3961da37397ba1bd0ea24535a6764b8