(upstream git commit 24346062c01ad690addb0db55b74f9c53b394c0c) Fix Coverity remarks (upstream git commit 12f402616050e6ac943217b2170e865c1a297e77)
(upstream git commit 24346062c01ad690addb0db55b74f9c53b394c0c) Fix Coverity remarks (upstream git commit 12f402616050e6ac943217b2170e865c1a297e77)