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

Change-Id: I0fbddd65da2698eb8aa5291e3ed8e19af2924b1f