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

Change-Id: If9a0a94377d5ba328413eea2467bef97eae3d8f9