Merge "Don\'t block while dispatching PRE_BOOT." into nyc-dev
am: e23f581081

* commit 'e23f581081b834d6928a4e8924432e0109391387':
  Don't block while dispatching PRE_BOOT.

Change-Id: I4ed9ae94721ce2b970001f4352fa2c5f2b10f0b7