[automerger skipped] Merge "Removes the defunct -s flag." am: a57d559918 am: 6a3f0c45d1 -s ours
am skip reason: Change-Id I0f83173c1dcd56e94d8eaafbc082c346aa11af7f with SHA-1 bfcd339319 is in history

Change-Id: I673add3bd6093baa05511933b8ff1e9056d9e3d8