Merge "Turn off WifiTetherSettings page." into oc-mr1-dev