8189989: Improve container portability

Reviewed-by: prr, azvegint, rhalade, skoivu
1 file changed