am 51ffaf54: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '51ffaf54a56441bba053d37a00122761c3a18f16':
  recovery: sleep after writing partition and closing it