Merge "Improve the error handling for armRebootEscrow"