Merge change 20439

* changes:
  Fix Bmgr's logic around restore completion