Merge "Fixing memory corruption bug in sound trigger V2_2"