[automerger skipped] Merge "Remove PARENT_SUB_ID since it's no longer needed." am: b48b0f6575 am: 6e06195a05
am: 92e0b2cf65  -s ours

Change-Id: I4cccaeffcf24769c4a00ff086151a8a9e7ef86f7