Issue #24192: Fix namespace package imports.
8 files changed