Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev