Merge cherrypicks of [12377288, 12377131, 12376898, 12377643, 12377644, 12376880, 12377268, 12377269, 12377132, 12377148, 12377149, 12377150, 12377151, 12377152, 12377153, 12377154, 12376899, 12376900, 12376901, 12377762, 12377763, 12377764, 12377528, 12377529, 12377530] into rvc-d1-release

Change-Id: Ifbe0fdc280fd3d6e4e37135ceb81f053f7549927
diff --git a/libnos_transport/transport.c b/libnos_transport/transport.c
index f7675da..77a430a 100644
--- a/libnos_transport/transport.c
+++ b/libnos_transport/transport.c
@@ -70,7 +70,7 @@
  * expect a reboot to take around 100ms but we'll keep trying for 300ms to leave
  * plenty of margin.
  */
-#define RETRY_COUNT 60
+#define RETRY_COUNT 240
 #define RETRY_WAIT_TIME_US 5000
 
 /* In case of CRC error, try to retransmit */