Merge "Apply stream volume for the correct device" am: c6b48fe627
am: 03a9cbbeb0

Change-Id: I90b77ff4c1240429836d9ada53855a01571d90d4