Simplify conditions with && and ||

Change-Id: I77fb945cdf6b18baec064d1ac4b6002ef02e437a
4 files changed