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

Change-Id: I08d836616888dc5e7cb905ae3c42316e533a0bde