Merge "Use current shims in service-connectivity"