Consolidate the wait in recovery's reboot am: e8ca1b8634 am: 8da7e4e502 am: d823bb5954

Change-Id: I236020cd782dbd88af281936a1d2fcc4ba0ba98b