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

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