Implement vocabulary shuffling

Change-Id: I02ac45bb6e7333a77f0b83021afa700b2761a2ee