Fix warnings spam

Task: PRODX-54485

Change-Id: Ic4868cc29435e4cd1533e737ce8eb8ca8fa27c13
3 files changed