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