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

Change-Id: I0ef9efe3c276cda7d2170d0cc32eddc59b2c338c