Merge "Revert multi-package APK flag to off." into oc-mr1-dev