am 8330bd51: am b0eb08b5: Merge "Remove the 5 sec timeout logic for...
am 8330bd51: am b0eb08b5: Merge "Remove the 5 sec timeout logic for setVolumeControlStream" into mnc-dev
* commit '8330bd51':
Remove the 5 sec timeout logic for setVolumeControlStream