Fix for issue 3371667: fix source code compilation warnings (4)

Change-Id: I898f81fea6c061b9ca7cbd675218d9f4b8c0bc77
2 files changed