Merge "Do not overwrite alias with device name" into lmp-dev