Merge "Clean up AuthenticationToken interface and add some doc"