Merge "Update CMake min version so that CMake 3.22.1 doesn't log a warning"