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

Change-Id: I2efd8b43c279c4cbd92130a08df6e3eafcb20b2c