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

Change-Id: I92194413198bb802a4cc625d45e98a57ee54c8e2