Flip conditions for readability

Change-Id: Ic8d6afa17ba314784152736a5fa0fff487f02b53