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

Change-Id: Ia3b7fe1bad2f3c2d13ce58f97174511ed8434e0b