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

Change-Id: I00bbeeaf234432913762cba40086a40314cc8468