Constraint validation

Change-Id: Ic111b3becece2164fa556fcd94f3f3e56aefd43b
Merge "Constraint validation"