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: 2ead59bd
am: 53c55c72 -s ours
Change-Id: Idb4950e09053c2b2898e30f8fe9d888048ba7f9f