Merge "Consolidate the wait in recovery's reboot" am: a69c69b26f am: 737a2e41bd am: 2bc65f82f6

Change-Id: Ife73c5e0d55f75169cdc430877cb3297e29ebb2c