Merge "Revert^2 "Move service-connectivity to the tethering APEX""