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

* commit '2006a0124e17064179e1cdd4cb43c768022c2799':
  Fix boot loop when deriving device name.