Merge "[ToA] Change the namespace to globalintl" into main