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

Change-Id: Ib352f1bb9fc9986ac66575fada52d4d73f18ecf6