Fix logic in validators

Fixes: 138953494
Test: atest SettingsValidatorsTest
Change-Id: I3c4387275f775ea9f9622bef8d8ca4b889b19c0b
3 files changed