Merge "Correctly hide setConnectionService" into mnc-dev