Merge "Handle compressed APK enable/disable" into oc-mr1-dev