Fixes #36919 Fix other eos modules integration test failure in dci (cherry picked from commit ba3201cd2f)
ba3201cd2f