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

Change-Id: Ibfee591728c5cf01d8e11b7ccf2418194d398b59