Merge "Better response when fail to reboot to AOT"