Fix for setting validation

Closes-Bug: #1396645

Change-Id: Icb0a6b278fc6bba6bd5c3f3d422e4e93232bca52
Merge "Fix for setting validation"