am 4a0e40a7: am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev

* commit '4a0e40a76431cc4ea0c052ea9106616593c1a3de':
  Volume: Avoid making bad forceVolumeControlStream call.