Merge "Introduce PermissionManager service"