Fixes settings validation

Change-Id: I74b990ffc4b3c29fbedfbc2cf601c468f5e4b9f2
Merge "Fixes settings validation"