Fix connector type detection

The output model string doesn't contain the connector type. The output
name is not guaranteed either, but it's the best what we've got.

CCBUG: 473338


(cherry picked from commit 730f45c1)