Merge "Fix the namespace for aconfig flag" into main