Merge "libsnapshot: GetSnapshotExtraDeviceName"
am: cc746b5193

Change-Id: Ida92e3f8bf1e0c00116a8344109e4d6c923661fd