Merge "getPhysicalInterfaceName not finding match in some cases"