Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into...
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am: 72933c62 am: a8e21860 am: 1d64d33b -s ours
am: 924b57b4
Change-Id: I685f3809c34585affb6a8d2a532c4cb707f820d8