Merge "Owner file fix for SoundTrigger"