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
Change-Id: I2e18c58c476c63535962c294c6a63716e536310b