Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev