Consolidate the wait in recovery's reboot am: e8ca1b8634 am: 32d28f90f0

Change-Id: Ib49ec82ad9eac87a1d26b1db1a408b3da2427282