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
am: 65a15237
Change-Id: I32244f5f1b03c642c8b751a56111f2cb243adc67