Merge changes  into audio-hal.lnx.5.0