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

Change-Id: I973dcd811a4bb2be42cdcb01fa0305d12989b6ef