Fix for settings validation

Change-Id: Ia7ddf0243abb4d3e4ed760e3e99d1d363eb559c8
Merge "Fix for settings validation"