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

Change-Id: I1a8f2509fd8390e5656b09a3ac1c6dc16bf4c11e