Merge "SoundTrigger OWNERS cleanup"