Merge "Revert "Revert "Re-add PackageVerifierTest to presubmit""" into tm-dev