S2W/DT2W/L2M/L2W

Change-Id: Ib8e521eb2da606bf47043dd5850a32bf5c4c88d6
Signed-off-by: flar2 <asegaert@gmail.com>