am 7c3749c2: am 6a62cac4: Merge "Further cleanup of the logic in device_init."

* commit '7c3749c24ad6dad7e5ddf5b0478731470761d99c':
  Further cleanup of the logic in device_init.