Merge changes  into audio-hal.lnx.8.0