Merge "Stop using trigger_reset_main."