Merge "Fix watchdog trigged issue during stress test"