Try to fix issue #15086: build failure on Ubuntu shared buildbot.
2 files changed