Merge "Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am: 49a16f09 am: e49c3675"