Merge "Move provider to permission manager"