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

* commit 'b20151b496aa8b6aa32e410f3517d11b516013a4':
  Volume change intent carries stream alias