Merge "Fix findConnectionTypeForIface." into lmp-dev