cppcheck: Logical disjunction always evaluates to true

Change-Id: I527c010a49210ccaa4840ea142525643944b642d