Merge changes from topic "metadata-audio-hal" into pi-dev am: f2797b2275
am: 2e98e5b6b2

Change-Id: Id00854c280fa96d42ce07fd8935afb24a6dd69bf