cppcheck: multiCondition, remove 2 duplicate "else if" blocks

Change-Id: I538bacd0e52a5e7d5df9847ad4632e02124aeb95