Cleanup Lib Validators

Change-Id: I58002a4de1ae11f07f8dd66e8febea71139f5763
Merge "Cleanup Lib Validators"