Merge "Fix up upstream interface types for case DUN_UNSPECIFIED"
am: 485d103083

Change-Id: I8e7c513b206cbc5f19d582ec48e529ce067e2aa9