DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a111 am:...
DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a111 am: aac7d044 am: 6ea7b630 -s ours am: 5eac1c25
am: 3015d9be
Change-Id: If74a836b1ab67c3dd32e0a177ddc3cbc2b17c173