Merge "SoundTriggerHelper changes for GenericSoundModels." into nyc-dev