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

Change-Id: I0203529837a3db89b0c02eaf4ea5bc9bdb4596a1