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

Change-Id: Ib77b6e6b3c477e029e4f5f7b83e7601444fb42d2