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

Change-Id: Id5e366ce17585f2c7f0ed1240ecaf71e75a603af