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

Change-Id: Ibdd1ba8afea270c75ad851a9af4cbd07f3c937a9