Merge "Don't reboot into recovery if block map file is missing." into nyc-dev