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: Icb2821341904697bb348220bb18c668cdc8dfddb