Merge "Revert "Minor LoadedApk refactoring.""