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

Change-Id: Idb7042cc4d8c9f3900a57cc162d343510b69534a