Merge "Add aconfig flag file" into main