Merge "API updates for TrafficDescriptr fields"