Merge "Synchronize DeviceDisconnect in VolumeManager"
am: c75b0b9d3f

Change-Id: Ief359f928e22451697b3409d78f0bac025694b73