Merge "Add TrafficDescriptor to DataProfileInfo"