am 00105805: Merge "Updating backup restore logic" into ub-now-queens

* commit '001058054a6957769e39c12c6bec636c85df6385':
  Updating backup restore logic