Merge "Re-expose TrafficDescriptor.Builder for testing." into sc-dev