Merge "Add the TokenBindingManager"