am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE

* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
  Add support for USB Ethernet adapters