am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev

* commit '61737d81a2e0a2cc327210bf771239655f62c3d9':
  Eliminate race condition around backup completion + resumption