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

* commit 'e352c88fbcfd917f6614597364d2e550aa691e79':
  recovery: write partitions more conservatively
  recovery: try to write EMMC partitions more reliably