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

Change-Id: I68bc1793b55e6e2bf660ea6c41611e819b3f5e9a