Merge "Fix VolumeHelperTest on automotive" into main