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

Change-Id: I81a0007d4865b23862879b23900d6bd65eb92af5