(cherry picked from commit bd781238)

Let's hope this fixes build on Linux-rpm_deb-x86@71-TDF

Change-Id: Ib102b257aa9bf183409c1ab99f61ee63d653cbed