Merge "Incorrect evictor key in TokenCache" into new-mm6.0