Merge "libsnapshot: use DeleteDeviceIfExists() when required" am: f8d80b7d56
am: 29b30cba04

Change-Id: Ie5bcb6b2c6aa0eff73e06a23f291a0a17743a5db