Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" into oc-dev