Merge commit 'e2585127974ce972a013407e2af95d8776a99a8e' * commit 'e2585127974ce972a013407e2af95d8776a99a8e': Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
Merge commit 'e2585127974ce972a013407e2af95d8776a99a8e' * commit 'e2585127974ce972a013407e2af95d8776a99a8e': Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op