Merge "Minor LoadedApk refactoring."