Merge "Remove unused package_verifier_state setting."