am e215b464: Merge "Wait for uncrypt to finish before rebooting"

* commit 'e215b46482af78b6259c867815dc5cf2198908d5':
  Wait for uncrypt to finish before rebooting