RACK: fix an issue triggered by using the CDG CC module
Obtained from: rrs@
Approved by: re (gjb)
PR: 238741
Sponsored by: Netlix, Inc.
(cherry picked from commit 99adf230061268175a36061130e6adb0882270e8)
(cherry picked from commit ae608d4ee7202cc34603e620bc551547e772c4d2)