Merge "libsnapshot: MapSnapshot: use device string for inner device" am: 24815a49d4
am: b55281cb5a

Change-Id: I0d0d940d93a863a8bfa2f31673b33878bf31bba0