Merge "Add missing container field to the aconfig flag file." into main