Backported fix for containers with language "all"

Change-Id: I7b2bd93217117607cf782d50d1ea8c8fe1dbd01c