Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev