Merge "Handle compressed APK enable/disable" into oc-mr1-dev
am: 93721c3a8a

Change-Id: Ib9cc5bd17068997752c90d6a091b064768ccf271