Merge "aconfig: separate package name and flag name using dot" into main