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

Change-Id: I3232f5a8ef6e7d810143fafc11b756ae16f41793