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

Change-Id: I350ace09460de3018d9aa6ff5d27fd82bd6cd390