Merge "RecoverySystem: do not check if socket is closed" am: 6cc2ca0b82 am: f533214352
am: 9f134c576b

Change-Id: Ifc7c2b7d49a58f572f78e1869717f1c6fcfee5c2