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

Change-Id: I62e363128e0b28cb7ac1e353b008853b13568858