Merge "Improve exception handling in SoundTrigger"