Merge "Make debug atom fail more often."