Enable new_tokenset by default and fix experiment compatibility. Change-Id: Ifd55343b701eb753537b9711abd377adcedde8ec