[automerger skipped] Merge "recovery: Refactor common setup into main()" am: 5b3d6cf58b am: 0abc18d520  -s ours
am: 41e47d6d0a  -s ours

Change-Id: Ifecfe86247c683366ede6a2d9e91b2c51990a1de