DO NOT MERGE use -sw instead of -w

Change-Id: I704b7a026298901da01d98e33df287d63cd3a265
8 files changed