DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 am: aac7d0442c am: 6ea7b630c2  -s ours am: 5eac1c2544 am: 3015d9be67 am: 65a152377c
am: 9c39ab6ea8  -s ours

Change-Id: If5306781bba4ca5653eb46c04d008cb0d2550566