Cleanup lib/Validators.

Change-Id: Iad47d841489e565eaa8e82b143684c2bb22f47e1
Merge "Cleanup lib/Validators."