Fixing some invalid checks and cleaning some redundant conditions

Change-Id: I770ce2cc2eccbee105958634e81bbc9bc2e4cc48
8 files changed