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

Change-Id: I06a91627cf75671ee0beee75284add560007dcd9