grouper: Enable persistent Dt2w and S2w

Change-Id: Ice0eeded26bfb411616b9a9997b7dc4cdd973bf8