Merge "Fix potential concurrency issue with setTechnologyTypeExtras." into nyc-dev