Merge "Fix SoundTriggerModel uses to GenericSoundModel."