Merge "libsnapshot: GetSnapshotExtraDeviceName"