Merge "Merge "Do not restart tethering while enabling tethering." into pi-dev am: f8f459a2cc am: e115195b2f"