Fix service samples, especially remote services.

Change-Id: I02c761f24ffddc1108b2c032f1820eac19ed2c05
3 files changed