Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev