For this sort of change I think the best strategy is "two passes".
Auto-format those O(30k) files and get global approval. Then, separately, make your two-line semantic change and seek approval from local owners.
Auto-format those O(30k) files and get global approval. Then, separately, make your two-line semantic change and seek approval from local owners.