Merge "Fix container for aconfig flags." into main