[Bug] Possible fix for boot service issue on some devices