Wait for power off before finishing discovery

This used to be part of returning-to-ramdisk, but was lost after
revert. Also do not make the ramdisk wait for it's own power off.

Change-Id: Ia43f834023b189324cba38a19cc782fc0b7745d4
Closes-Bug: #1401872