Enable consumption of old 1.6 built root bundles

Fixes #17398.

(cherry picked from commit 2e59e88d38a047c70a10f9594ecc7b875a38fa3d)