Merge "Revert "Revert "Add the TokenBindingManager"""