Merge "Delete APK snapshots during restoration (3/n)" am: b87b05f286 am: 15439d0c07

Change-Id: I3fb43d4601294a87beebe7c38dab5b7a186fa5f9