Merge "Remove PARENT_SUB_ID since it's no longer needed." am: b48b0f6575
am: 6e06195a05

Change-Id: I803df885374c7de1479cdfff68134b2103a72559