am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev

* commit 'f0affc6d46849e844bec9ddc755ffae0042e443f':
  Correctly hide setConnectionService