Merge changes from topic "audio-hal-v4-pi-dev" into pi-dev
am: 20e21fd711

Change-Id: I4634d7daf302479f4701ca90a23fdf3656bff506