[automerger skipped] Merge changes from topic "audio-v5-api" am: d8ebd25073 am: 8a05b4f3e3
am: 64222da827  -s ours

Change-Id: I53cf907e4e940288d0f88e3227e1f2f109d03aeb