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

Change-Id: I685f3809c34585affb6a8d2a532c4cb707f820d8