DO NOT MERGE: Backport N backup/restore stability work to M am: d6f3a11107 am: aac7d0442c am: 6ea7b630c2  -s ours
am: 5eac1c2544

Change-Id: Ibd925a475c5ae43a6ab07c0c8920167e7ce85cec