Merge "remove inprocess tethering"