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

Change-Id: I2bb0ba88e8daeecc82014388d1a0fba54cd7847f