Simplify if statement logic

"(A and B) or ~A" is the same as "~A or B", so use the latter.

Change-Id: Ic2eb3eed31b311070f895e05523df433dea11579
Merge "Simplify if statement logic"