Merge "Fix interface name for tethering"