Merge "Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am: 49a16f0998 am: e49c3675fe"