Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev