Merge "Change Tethering package name"