Fix token ids for memcached

Bug 1119641

Change-Id: Ia22764acc69a272b37364193d10c553a48679b9a
Merge "Fix token ids for memcached"