Merge "Base: Remove unused triggerThreshold field" into udc-dev