STYLE: Minor Cppcheck style fix

Change-Id: I702258cf32e813935907f3d7e1f00bb6d66405a8
Merge topic 'CppcheckFixes'

658e550 STYLE: Minor Cppcheck style fix