Merge "Removes the defunct -s flag." am: a57d559918
am: 2a9b3aeeed

Change-Id: Ifec7d999fae7eddeb83cd0bf4c3d498632ab9559