Merge "SoundTriggerHelper re-design." into nyc-dev