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

Change-Id: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264