Get rid of incorrect usage of interfaces in ValueValidators

Change-Id: Ib0a591aafe41b5d84c13b179e3171d77709db8f6
Merge "Get rid of incorrect usage of interfaces in ValueValidators"