Merge "Revert "Check permissions only against packagesettings"" into pi-dev
am: 61aebf6d39

Change-Id: Idfe77e93a7dd1f3e87e58c1f323c080ed615a57a