Merge "Stop unnecessary tethering reconfigurations" am: 8ad1c81b07 am: 009d42ffe0
am: 626c3e8739  -s ours

Change-Id: If8586140a21eea1fae0b61e073db3a7665d111ac