Merge "Handle safe mode in PackageManager." into oc-dev