am 1ad40a96: Merge "Fix boot loop when deriving device name." into lmp-dev

* commit '1ad40a966096c277123cf3d15a4ccdb2cd8af566':
  Fix boot loop when deriving device name.