DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 am: aac7d0442c
am: 6ea7b630c2  -s ours

Change-Id: Iefb7a9ad5f00b0f6e24c45fe5cf1d17cb0c97414