Update Validator to work with new packages

Change-Id: Icdfeb3d486f18f1af1586428cf6f1477c4e1b0d1