Merge "Update default device name to MODEL only" into lmp-dev