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

Change-Id: Ia3a2ab18bc17f23803c3424a2f38ea54b7db7a47