Merge "SoundTriggerHelper: Remove unused models onLoad"