Merge changes from topic "audio-v5-api"
am: d8ebd25073

Change-Id: I0fefff730fe98b4b540a9aa6085586c4d55615d1