Enable S2W/DT2W by default

Change-Id: Ib1736e718dd598947b98795d16e0dfe83a97f385