Merge changes from topic "audio-package-update" am: 2d5156733c
am: cad356a9d0

Change-Id: I5ddb28a330b0c43966c068ef8f2db96761c3b70c