Merge "DO NOT MERGE Removes additional subtypes when clearing data." into udc-dev