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

Change-Id: I5ac1fce3ab71415061ba152d9e34c96f9a53e1c9