This is required to support netboot (which is off by default, but is useful together with the netboot fallback). Change-Id: I4d7640a24fac9fca2c24bc06fcedff400d74ed8d