Merge "Fix incorrect package in PackageChangeReceiver"