Merge "API updates for TrafficDescriptr fields" into sc-dev