Merge "Fix service samples, especially remote services." into mnc-dev