Merge "Remove unused code from StagingManager and PackageManager"