Merge commit 'd34f05cb6e67e28a4955332173950466edf0be3e' into audio-hal.lnx.5.1

Change-Id: I4656a1a78c2b1d4b4834b2fd538699f96e2aa90e