Merge "Enabling sound trigger V2_2"