am d3f2f59c: Merge "Fix edge cases leading to backup hanging forever"

* commit 'd3f2f59c46b3979a76eae02cfb4a7071425556e1':
  Fix edge cases leading to backup hanging forever