Merge "Add wait time for Wi-Fi tethering test, bug http://b/issue?id=3436586"