Merge "Remove redundant WiFi tethering listener" into tm-dev