am c40de32e: resolved conflicts for merge of 6cec7f35 to honeycomb-LTE

* commit 'c40de32ef747fc206d3ec2980b8f7a7aff0f1967':
  Add support for USB Ethernet adapters
tree: 0e98ba6bc8353292deb3bbf6ebc88d87911a52c2
  1. core/
  2. services/