Merge "Revert "Add the TokenBindingManager""