am 3421280b: (-s ours) am 8751e689: Merge "Correctly hide setConnectionService" into mnc-dev

* commit '3421280b466e24dc0e55f9af3202195004431f1e':