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

Change-Id: I1046f028f57f2eba22686f73c5856761e639f376