Merge changes  into audio-hal.lnx.4.0