Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev