Merge "Flatten the transitions to tethering and hotspot." into oc-dev