More beats+bravia consolidation

Change-Id: I8eb348528e39786e236f2bc6e1a84b3d360468fe