Ideally yes, but the intent of this breakdown into 4 PR's is that this one really is to address coding standard violations, so to add I18N into this seems like out-of-scope and re-muddies up the goals of this PR.