diff -Nru network-manager-1.2.0/debian/changelog network-manager-1.2.0/debian/changelog
--- network-manager-1.2.0/debian/changelog        2016-05-12 14:53:24.000000000 +0800
+++ network-manager-1.2.0/debian/changelog        2016-05-26 11:58:19.000000000 +0800
@@ -1,3 +1,11 @@
+network-manager (1.2.0-0ubuntu0.16.04.3) xenial-proposed; urgency=medium
+
+  * debian/patches/wifi-malfunction-after-suspend-resume-stress.patch: Fix the
+    regression by wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch.
+    (LP: #1585863)
+
+ -- Shih-Yuan Lee (FourDollars) <sylee@canonical.com>  Thu, 26 May 2016 11:55:55 +0800
+
 network-manager (1.2.0-0ubuntu0.16.04.2) xenial; urgency=medium
 
   * debian/patches: lp1574347-re-read-link-type-if-the-name-changed.diff
diff -Nru network-manager-1.2.0/debian/patches/series network-manager-1.2.0/debian/patches/series
--- network-manager-1.2.0/debian/patches/series   2016-05-12 14:53:24.000000000 +0800
+++ network-manager-1.2.0/debian/patches/series   2016-05-26 11:57:14.000000000 +0800
@@ -25,6 +25,7 @@
 adhoc_use_wpa_rsn_part1.patch
 adhoc_use_wpa_rsn_part2.patch
 wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch
+wifi-malfunction-after-suspend-resume-stress.patch
 
 # wifi powersave
 default_powersave_on.patch
diff -Nru network-manager-1.2.0/debian/patches/wifi-malfunction-after-suspend-resume-stress.patch network-manager-1.2.0/debian/patches/wifi-malfunction-after-suspend-resume-stress.patch
--- network-manager-1.2.0/debian/patches/wifi-malfunction-after-suspend-resume-stress.patch       1970-01-01 08:00:00.000000000 +0800
+++ network-manager-1.2.0/debian/patches/wifi-malfunction-after-suspend-resume-stress.patch       2016-05-26 11:55:42.000000000 +0800
@@ -0,0 +1,14 @@
+Index: network-manager-1.2.0/src/supplicant-manager/nm-supplicant-interface.c
+===================================================================
+--- network-manager-1.2.0.orig/src/supplicant-manager/nm-supplicant-interface.c  2016-05-26 11:54:00.000000000 +0800
++++ network-manager-1.2.0/src/supplicant-manager/nm-supplicant-interface.c       2016-05-26 11:55:39.953636894 +0800
+@@ -1334,8 +1334,8 @@
+                         g_dbus_error_strip_remote_error (error);
+                         _LOGW ("could not get scan request result: %s", error->message);
+                 }
+-                g_signal_emit (self, signals[SCAN_DONE], 0, FALSE);
+         }
++        g_signal_emit (self, signals[SCAN_DONE], 0, error ? FALSE : TRUE);
+ }
+ 
+ gboolean