am 576563c3: Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev

* commit '576563c3d37ba58bc94e87aa385d92dc79498003':
  Using Manufacturer and not brand for device name