Merge cherrypicks of [2461233, 2461302, 2461279, 2461176, 2461341, 2461280, 2461290, 2461342, 2461291, 2461216, 2461217, 2461304, 2461306, 2461381, 2461307, 2461234, 2461195, 2461308, 2461362, 2461235, 2461218, 2461363, 2461323, 2461382, 2461345] into oc-release

Change-Id: I3c3e0d6b73111f5a8fdc2e8984148e28dbf20115
diff --git a/acts/tests/google/wifi/WifiTeleCoexTest.py b/acts/tests/google/wifi/WifiTeleCoexTest.py
index 3e4479d..9d8b9ec 100644
--- a/acts/tests/google/wifi/WifiTeleCoexTest.py
+++ b/acts/tests/google/wifi/WifiTeleCoexTest.py
@@ -118,11 +118,18 @@
 
         """
         self.log.debug("Toggling Airplane mode ON")
+
         asserts.assert_true(
             acts.utils.force_airplane_mode(self.dut, True),
             "Can not turn on airplane mode on: %s" % self.dut.serial)
+        # Sleep for atleast 500ms so that, call to enable wifi is not deferred.
+        time.sleep(1)
+
         self.log.debug("Toggling wifi ON")
         wifi_utils.wifi_toggle_state(self.dut, True)
+        if not self.dut.droid.wifiGetisWifiEnabled():
+            raise signals.TestFailure("WiFi did not turn on after turning ON"
+                                      "Airplane mode")
         asserts.assert_true(
             acts.utils.force_airplane_mode(self.dut, False),
             "Can not turn on airplane mode on: %s" % self.dut.serial)