Merge "Prevent exceptions in pre-reboot verification from crashing system server"