am 3a0d77f4: Merge "Volume change intent carries stream alias" into mnc-dev

* commit '3a0d77f42aa8bbc3e3f81bb80a55324fc686e2a7':
  Volume change intent carries stream alias