Merge pull request #16391 from nabinhait/cc_fix

fix: Travis fix for hotfix branch