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

* commit 'cac65febb7bf50f0bc03d897ebbafa8347c0de31':
  Correctly hide setConnectionService