Merge "PackageManager: Fix incorrect usage of flags."