Merge "Remove PARENT_SUB_ID since it's no longer needed." am: 4dd4cf5679
am: 5b1804a9e8

Change-Id: I701364670d2a8bcd9e2ad69e229fb1920c5bd7ae