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

Change-Id: I051fc7af9663a90ff5b7e080dd44001646d35089