Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0