Remove unnecessary branching in validation

Change-Id: I3bc1d76a8855868fd794c3aad2fa5e6733979ea1
Merge "Remove unnecessary branching in validation"