fix quoting in token stuff

Change-Id: I30a85ee313f03dc5f5c78356461da7fb66521d7a