Merge branch 'devel-en' into devel-zhs

# Conflicts:
#	apk/ai.comma.plus.offroad.apk

selfdrive/car/car_helpers.py

@@ -84,9 +84,9 @@ def fingerprint(logcan, sendcan):
   frame = 0
 
   if params.get("DragonCacheCar") == "1" and params.get("DragonCachedFP") != "" and params.get("DragonCachedModel") != "":
-    candidate_cars = params.get("DragonCachedModel")
-    finger = params.get("DragonCachedFP")
-    vin = params.get("DragonCachedVIN")
+    candidate_cars = pickle.loads(params.get("DragonCachedModel"))
+    finger = pickle.loads(params.get("DragonCachedFP"))
+    vin = pickle.loads(params.get("DragonCachedVIN"))
   else:
     while True:
       a = messaging.recv_one(logcan)

selfdrive/manager.py

@@ -118,7 +118,6 @@ managed_processes = {
   "updated": "selfdrive.updated",
   "athena": "selfdrive.athena.athenad",
   "dashcamd": "selfdrive.dragonpilot.dashcamd.dashcamd",
-  "safeguardd": "selfdrive.dragonpilot.safeguardd.safeguardd",
   "shutdownd": "selfdrive.dragonpilot.shutdownd.shutdownd",
 }
 android_packages = ("ai.comma.plus.offroad", "ai.comma.plus.frame")
@@ -142,7 +141,6 @@ persistent_processes = [
   'ui',
   'updated',
   'athena',
-  'safeguardd',
   'shutdownd',
 ]