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

Change-Id: I7f53f5e4abe21abaf97513bf6aa3d1835b264e06