Merge "Remove PARENT_SUB_ID since it's no longer needed."