Change swift to the new s-* services.

- Fixes bug 1155586.

Change-Id: I9037892713d19a89256eaeafa670dfde2d429e19
Merge "Change swift to the new s-* services."