Merge "libsnapshot: use DeleteDeviceIfExists() when required" am: f8d80b7d56 am: 29b30cba04 am: 3afd41d60f
am: 03b6b1f22f

Change-Id: Ic3a8c56ee2927789a567c3a162a2bc6af774cc50