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

Change-Id: I20921b9aa611838bc88fcabe1dc619de0bd9f6c1