Merge "Set active volume device to null if there is no new device" am: 0eb91d32c7 am: 77e7e3c195
am: 8de6dff325

Change-Id: I317cdc334548d8fed2c6d57994597b8e32339783