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

Change-Id: I876167c5501302dfa791f01f7d9493d503ccfbef