Merge "Do not use TetherUtil.setWifiTethering" into nyc-mr1-dev