Merge "Use private dns port definition in static lib"