Merge "Synchronize DeviceDisconnect in VolumeManager" am: c75b0b9d3f
am: 3d51e2dafd

Change-Id: I27a921c3b33cedfc517becb548c6706f8da82cd1