[automerger skipped] Merge "Remove PARENT_SUB_ID since it's no longer needed." am: 4dd4cf5679 am: 5b1804a9e8
am: 8656f52d4a  -s ours

Change-Id: I9787a7a33dcd85cbfef96d521d9d997a6ee9ba0d