Merge "Move grantPermission to permission manager"