Merge audio-userspace.lnx.2.1-rel on remote branch

Change-Id: I181b4424624c7ddbe084efcfd06b3170340a1103