Merge change 23463 into eclair

* changes:
  Wait for HCI to come up if getting the adapter path fails.