Merge "sound trigger HAL: remove dummy Union" into oc-dev