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

* commit '2a66b6c0efd3f01a4a3a0004a3b3fc79bb920d61':
  Fix boot loop when deriving device name.