Merge "Prioritize hardware error over no enrollment error" into main