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

Change-Id: I8bfcbb451463e1265f43e7d9b3405b328873c5f9