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

Change-Id: I2e3eb3aa08246d3dda9530512b6645cc90bfe9c2