Merge changes from topic "audio-hal-v4-pi-dev" into pi-dev
am: 2076105d33

Change-Id: Ieb3d1bd7e0a898308c1c1675a2d6ded086115394