cppcheck: Fix same expression on both sides of '&&'

Change-Id: Iddc7ac546cbe105466278a733f5ae17451b9670b