Fix boot loop when deriving device name.

Bug: 17490408
Change-Id: If1cc25a341eed4e41a7bf170bab077203fa19d15
2 files changed