[automerger skipped] DO NOT MERGE: Add socket communication between recovery...
[automerger skipped] DO NOT MERGE: Add socket communication between recovery and minadbd am: 95d67323 -s ours
am: 06e006ca -s ours
am skip reason: subject contains skip directive
Change-Id: I284e5df434448b9484ff15dd474f73418a6d0287