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