Update to 6.2.2
Fix the broken build with help from Steven Hartland.
PR: 226039 Submitted by: Steven Hartland