Changes for multiple APK support.