Move EntityValidators to correct namespace.

Change-Id: I69fd036187efcc9114504a2ad5bc71fda7953195
Merge "Move EntityValidators to correct namespace."