Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am: 72933c623c am: a8e21860af am: 1d64d33ba8  -s ours am: 924b57b42c
am: 345219f068

Change-Id: I1008c31eec5fbc8611de32324a736b4da5d7fc8e