am 27d82715: Merge "Fix service samples, especially remote services." into mnc-dev

* commit '27d827158fb0c80ad3f16e7ccb1df5ca57ff7289':
  Fix service samples, especially remote services.